Added constructor, moved ParserState struct to cpp file