Really fixed the formatting function