Formatting
Refactor modeling