Logic cleanup
Parser Code Cleanup
Parser cleanup delete complete bugfix
Rewrite brought to working level