Rubocop Polishing

This change updates the code to meet Rubocop requirements.