Refactoring and restart