Clean that up a tish