Improve some of the syntax and styling in make.js