refact & format