Clean it up just a little bit