A little clean up and comments