Cleanup of comments and variable declaration as suggested in review.