Code cleanup from github review.