Code cleanup in parser