refactor receiver, decorator module