code cleanup
At the risk of breaking indentation dogma, I find these one liners more readable sometimes. Also removed NB_RANK_FILE which doesn't really make the code more self-documenting.

No functional change.
signature = 6727896