Neatening things up a little