Remove old comments and correct an error warning
Move all external classes instantiations in the contructor