cleaned up some model/controller stuff.