Fixed formats for cli