Fix solution to the second problem: Rename everything and parser clean the logic