Changes from Rubocop