refact && format