Minor changes (comments ++)