some more changes to transitioning to mvc style