Issue-1 : Refactor names of formatters