Applied changes from Max's review.