improved formating