Reorganizing, standardizing, and refactoring for clarity.