Refactor - Simplify callback code.