cleaning up parsing