coding style: misc improvements