- cleaning up how the builder pattern operates.  removing special cases