Cosmetic fixes
Change server class to 2 space indent