Fix rubocop violations
Finishing rubocop compliance