Mary review

Code review.