Clean it up a tad