Andrew's style changes