Remove node-waf commands from package.json, minor fixes, and reformat
for readability.