Clean it up a bit