some preliminary style changes