cleaning code and correct parse mappings