Fmt
Refactoring