#9 cleanup comments in builder