Cleaned up the parser. See commit changes.