Final Rubocop Fixing