code formatting (!BREAKS DIFFS BADLY!)