typo and a little clean up