some codeStyle changes