Refactor model, general cleaning up elsewhere.