Style clean-up and small refactors

Hi there,

This is mostly a cosmetic PR and small refactoring to clean up styles according to the [Ruby Style Guide](https://github.com/bbatsov/ruby-style-guide). I find this much easier to read that what Hound suggests (single quoted strings, for example). Feedback welcome.
What was your goal here? I personally prefer one liners when they are easy to read...but maybe it is not?