Improved Formatting Greatly