Make formater a little bit more generic