Simplify. No functional changes.
Reorder the private methods. No functional changes.