Refactor|Model: Cleanup