Minor cleanup based on PR comments