Added BuilderHelper
Refactorings
Cleanup