Ranks from divisions; tidying up