ll more #builder and #initialize refac