fixup! other code quality improvements