removes some code smells
Merge pull request #14 from folieadrien/removes-code-smells

removes some code smells