Quality fixes
Merge pull request #47 from norzechowicz/code-quality

Quality fixes