refactor: extracting the formatting responsibility to the formatter class
removing unnecessary underscore