Clean that up a bit