more dead-dev style changes