Simplify Parser
Code cleaning