Restart class refactoring