Some rubocop fixes