merge style changes from branch for colin