Improve some of the syntax and styling in builder.js