Switching from 4 spaces to 2 spaces for indentation. A few more idiomatic.js style improvements