cleaned up some code following up the new parser system