Cleaned parser