Added reset feature + refactoring