Revert "code review cleanup"
Merge pull request #3 from lshift/revert-2-code-review

wrong code review merged