Merge "Code cleanup."