Apply fixes from pre-commit review

This patch is applied before adding `pre-commit` to keep CI passing
consistently.

Signed-off-by: Alex Nelson <[email protected]>

Author: ajnelson-nist