removing comments and debug messages
fixed indentation and removed comments
Merge pull request #119 from tiger-swallowtails-2014/final_fix

Final fix