Some refactor + split rank getter.