modify & refactor
refactory format