Adding missing comments and restructuring methods of the parser