ActionResult refactor