mostly style changes