[FOLD] Refactory and tidy