Moved data load to model, slight formatting