Refactor formatter
Formatter and rubo