Readability and Debugging

Formatting, Getters & Setters, a few class functions, etc