Cleaned up execute_move a little