Refactored reset