Parser - little cleanup