Code cleanup changes.