Rubocop is my master now

  * Make the tests pass :blush: 
  * Keep Rubocop happy as much as possible