Refactor decorators