refactor(*): move category decorating out of service