Simplify feedback code