removed one unnecessary layer in parser, shortened a few names