minor style/reordering