move the formatters to separates function
update comments