Clean it up even more