Formatting
CommandLine refactoring / minor changes
Added new getKeys, thanks stackOverflow