Glasgow star reestablishing himself for club and country