Small cleanup and more info