formatting; other changes?