visualization improvements and cleanup