Revert "Revert "did some code cleanup""
Merge pull request #3 from skazer/revert-2-revert-1-code-cleanup

Revert "Revert "did some code cleanup""