Removed old code
Refactored reset method