cleaned up the parser in model.