Refactor lots of stuff and make the code Rubocop-compliant!
Merge pull request #24 from mirego/refactor/rubocop-and-stuff

Refactor lots of stuff and make the code Rubocop-compliant!