Some structural style changes