code cleaning: change comments