Refactoring after review.