Made reviewer recommended changes