Remove more code smells
Merge pull request #17 from jedmao/code-smells

Remove more code smells