minor tweaks to clean up code, commented forgotSpec out as I ran into issues testing it due to the uuid