Initial review-inspired changes