cleanup
more cleanup
fix route
Merge pull request #1 from mbeck5/cleanup

Cleanup