Upgrade App Based on PR Response - Slight Code Changes for Elegance