Refactored for Simplicity

all of the changes relate to the reset button