Some cleanup and renames. Also I think I need to reset the timer each
time.