Code comments fixes