Style & spec updates (rev 2)

No functional changes beyond those

Revised to satisfying a few missing style constraints