move commands

cleaned code