cleaner models, re arranged models, simple bootstrap