US530 - Code refactor for feedback/header