misc code style changes