fix more style consistencies