Refactor and ava rank getter.