Refactor to delay beautify execution.