Initial rubocop fixes