Removed unnecessary stuff from parser, added comments