Update Rubocop fix

An earlier commit removed some code to satisfy Rubocop, but in the
process made some variables public that do not need to be. This change
fixes that.
Merge branch 'fix-rubocop'