Minor cleanup and class renaming.