fix more formatting issues