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

Revert "did some code cleanup"