Code cleanup and beautification.