More cleanup, commenting and rearranging...
Merge branch 'master' of github.com:shitsumon/MMProject12