Refactored for Clarity