Refactor to agreed standard.

See https://gist.github.com/sw1nn/6b6043d9051271abf44e