need some cleaning done in Models