style changes per Dave Bringle's suggestions