#1894: Changed some commenting