Formatting, in prep for non-cosmetic changes