Builder Refactor

Refactor the builder code semantically :)