Minor update according to the code review comments.