Improve code comments in code from previous commit