Issue #18: format fix + revert to rank assignment