style-guide cleanup