Standards compliance

Yay!