some more small style improvements