Improve readability so some comments can be removed.