Final changes to formating