Revert "More formatting"

This reverts commit 49911413bebfcc9634b299475db1a3d72ce93506.