Removed double quote requirement for commands and cleaned code up a bit