Improved commenting even more