Strong refactoring after review.