indent and cleanup.