Improved commenting