Style & spec updates

No functional changes beyond those