Cleaning. Make builder indent optional.