Style tweaks. Cleanup.