Minor cleanup and tweaks