RF: style tweaks in builder.py