Clean up and passes review.