Rubocop fixes
More rubucop fixes
More rubucop fixes! :+1:
More rubucop changes