StyleGuide - more cleanup