CommandParser - code cleanup