Refactoring Cleaning Builder Pattenrn Impl