Textual cleanup.
Rename types.
Textual cleanup.
Indicate private access explicitly.