Clean it up more