Improve the data members comments