CAL-41 push declaration of the class in the constructor method, to avoid prototyping