refactoring / cleaning up the models