Updated Formatting in Classes