Refactored parse table into own class
More refactoring