Clean up Builder.java to allow for future Expansion