improve formating