style changes

mostly style changes