Rv 333 rubocop

Fix RuboCop warnings.