first round of rubocop fixes