Added two new parsers and cleaned up some code