Recommended changes from review