removed unnecessary logic from parser
changed some method permissions in parser from private to protected (preparing to parser injection!)