refactor - utils are extracted to different class