Cleaned up initial boilerplate
Merge branch 'parse_cleanup'