General auto-format changes