A few adjustments, as per the review