Drew's suggested formatting fixes