Improving comments of the code, there is room for further improvement