Extract helpers to separate module