fix - code style
improve - use builder for default factory method