Code cleanup.
Background tweaks.