DISCL-235: Code review Friday refactorings

This is preliminary draft review
I am not against raw pointers, but wouldn't be nice to sit and relax for deletion ( if order is not important ) using a scoped_ptr ?