Test cleanup
Code cleanup in parser