more style fixes for wrapping