Refactor: simplify core mod