Improved comment discovery