Feature/formatter2