Minor update

Mostly cosmetic, more changes coming later.