cleaned up builder code