Code Clean Up

To do: Rewrite commands.