some more code review