Extracted reusable utils into new module