CommandParser has been refactored by sorting using directives, adding new lines after curly brackets and appending this before non-static methods called within the class.