Fixed formatting for many classes. Improved code readability.