Minor adjustments as per review