More refactoring. Reset button is working