0.0.36.2 - Function-class + CodeCleaning