Trying to clean up a little.