Correct issues reported by rubocop