Style guide cleanup