code review cleanup
Merge pull request #2 from taheris/code-review

code review cleanup