Added UCERF3 Model, cleaned up