Tweaks based on brotherly feedback.