Code review, some changes