more clean up
streamlined the builder and got rid of the abstract base builder classes