Renaming, spacing, and other cleanup/fixes.