builder : some cleanup