eliminated dupe code in parser