code cleanup
Merge pull request #49 from kurund/code-cleanup

code cleanup