Clean it up a little