code cleanup and comment tweaking
updated to meet Theme-Check
Merge pull request #12 from DaJoker29/development

code cleanup and comment tweaking (issue #7)