Refactoring join-qualifier for readability