a few more small style changes