Address some Rubocop concerns