minor refactoring, parser spec