Style improvements.

h.t. @key88sf