Incorporated suggested review comments