Added formatting to main class