Minor changes
Helper methods, cmd, cmdArgs, hasArgs now global for helper methods to use
Fixed indents