Refactoring - current state