minor parser refactoring
if elif else test