DISCL-235: Code review Friday refactorings

This is preliminary draft review
is data[0] carrying a raw pointer ?