a bunch of small style changes