Clean up parsing