Cleaning it up a little more.