Slightly refactors Model