Clean up the code just a touch.