more (idempotent) fixes per style-guide and code-review