Remove excess whitespace
Move variable initializations into reset()