Formatting Pass on Model