Incorporated review feedback from devoncarew.