Rubocop Polishing

This change polishes the code to be Rubocop compliant