Fixed set_command
Got set_command() to work and improved readibility and consistency by adding whitespace