more minor ocd-like changes.