Refactoring model managers
Code tidy