Changes to make rubocop happy