various rubocop style fixes