Updated formatting and clean up based on review.