more small style fixes