Refactoring ...progress...