Clean it up a bit more..