Cleaned up Website Controller & Model