Improve readability of comments, try not to traverse strings