o Start refactoring ...