add better formatting