Remove duplicate code in parser