StyleGuide: massive cleanup