Extract out methods as a precursor step to making the class subclass friendly