Clean up and fix spacing
Merge branch 'master' of github.com:kristas/cantina