Address issues that Rubocop identified