small refactoring in the parser commands