Refactor parser architecture in order to follow the cake pattern. Improve source code by using some basic syntactical sugar