Post-code-review improvements