Minor improvement of the cpp