Refactor reactive tags