Clean up the code a little.