RuboCop's suggestions implemented.