Refactoring current state