more changes to make rubocop happy