Incorporated review comments

Used a different branch because of the rebase.