diff --git a/include/layout.h b/include/layout.h
index c1d7d8b46..5c73af997 100644
--- a/include/layout.h
+++ b/include/layout.h
@@ -17,7 +17,7 @@ swayc_t *add_sibling(swayc_t *sibling, swayc_t *child);
 swayc_t *replace_child(swayc_t *child, swayc_t *new_child);
 swayc_t *remove_child(swayc_t *child);
 
-void move_container(swayc_t* container,swayc_t* root,int direction);
+void move_container(swayc_t* container,swayc_t* root,enum movement_direction direction);
 
 
 // Layout
diff --git a/sway/commands.c b/sway/commands.c
index e39b781a2..5d79104f6 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -362,6 +362,7 @@ static bool cmd_move(struct sway_config *config, int argc, char **argv) {
 	}
 
 	return true;
+}
 
 static bool cmd_gaps(struct sway_config *config, int argc, char **argv) {
 	if (!checkarg(argc, "gaps", EXPECTED_AT_LEAST, 1)) {
diff --git a/sway/layout.c b/sway/layout.c
index a48f15c4f..0c1f736d9 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -108,7 +108,9 @@ swayc_t *remove_child(swayc_t *child) {
 	return parent;
 }
 
-void move_container(swayc_t *container,swayc_t* root,int direction){
+//TODO: Implement horizontal movement.
+//TODO: Implement move to a different workspace.
+void move_container(swayc_t *container,swayc_t* root,enum movement_direction direction){
 	sway_log(L_DEBUG, "Moved window");
 	swayc_t *temp;
 	int i;
@@ -121,8 +123,6 @@ void move_container(swayc_t *container,swayc_t* root,int direction){
 				//Only one container, meh.
 				break;
 			}
-			//TODO: Implement horizontal movement.
-			//TODO: Implement move to a different workspace.
 			if(direction == MOVE_LEFT && i > 0){
 				temp = root->children->items[i-1];
 				root->children->items[i] = temp;