Cleaned up the parser