Some formatting and code review.