began cleaning up minimal parse code