Typo and a little cleanup, thanks Jay