Style. Model refactor.