Put proper formatting in place