Ugh, fixing formatting issues once and (hopefully) for all!