Added formatting settings and naming conventions