update client object MVC; general code cleanup