Final Rubocop changes!