Visual improvements and cleanup.