Moving shared logic into common file
4 files changed