Refactoring post review.