Added formatting and restructured model