Cleanup, formatting, minor tweaks.