Removal of extraneous commented code & added a few comments
Merge branch 'master' into steven