Improved formating