Cleanup, simplification, display