Some cleanup and beautification.