Code review, mainly comments.