bunch of style changes - picky me is