Code cleanup and case change.