Fixes

(your pick / average) style