Refactors the Models