Incorporated change requests from review