fix more style issues