misc. style cleanup