Cleaning it up a bit.