Adds in several formatting edits