cleaned up parsing.