[PR] General cleanup in the builder code