Refactoring into better style, model-like goodness.