refactor. +func add2builder
refactor rename some vars