Improved formating and structure