Try to neaten up a bit