Recently forked this for our organization

We like spaces in our function definitions - we think it's mostly reasonable.