Parser Code Cleaning