Remove code smells
Merge pull request #16 from jedmao/lint

Remove code smells