This should tidy things a little bit.