Part 18: Cleanups. Consistency.

6