More comment improvement