Refactor the builder logic to make it a bit easier to follow