style changes, unfinished