cleaning up
cleaning
change model prop names
clean