Revert "Revert "Improved formatting""

Click "merge" and my changes will be back.