Dumb format changes. Finished adapting branch to changes performed in #659 and #666