Tidy code a bit.