Code review

Please review.