current refactoring