Continuing to refactor code to conform with RuboCop rules.