DRY fix controllers