refactor, code cleaning
Merge pull request #4 from paulslaby/refactor

refactor, code cleaning