Cleanup
First pass at parsing