Small cleanup and tweaks