Added Formatting
Updated Model