More tweaks, cleanup, standardization.