reorganization and a couple comments
Merge pull request #1 from Not-steve/patch-1

reorganization and a couple comments [From Not-steve]