Remove code duplicate
remove code duplication
Reduces method complexity
Update dependencies
Remove dead code
Merge pull request #27 from wcandillon/refactoring

Improve codeclimate score.