(cleanup) Update comments; Remove obsolete code
Merge pull request #47 from Jygsaw/dev

(cleanup) Update comments; Remove obsolete code