issue_80: another cleanup of controller and view