Refactoring the Owners Controller & Model