Todo cleanup/review.