Fix rubocop and address issues it found