lots of little style changes