Adjust how the builders are refreshed and improve indentation