Adjusted some comments in the code