Refactor utils modules