Refactor parser switch into operation functions
Better operator loading in parser