Review Naming And Readability

Review names and structure for clarity, and flag code a newcomer would find hard to follow.

• review
• code