cleaned up some more code in abc parser
cleaned up some more code in abc parser