Apply rubocop recommendations
Allow CT update