Refactor after review.