reformat
Update controller, models