Style fixes
Tweaks to yearly