code clean-up
Merge pull request #5 from Zielak/dev

code clean-up