final revisions for the code review