Improving comments a bit