Cleaned up per CR review.