Refactoring ...  not working