made Steve's style changes