Added comments, improved code flow, removed unused code
Merge branch 'master' of https://github.com/mmeyer2k/noodle.git