Cleaned the parser