NOJIRA: code cleanup; no functional changes