improved controller response refactors