[clean] cleanup code and comment

... my first C++ lambda ! :-)