Improved on formating issues