Avoid using instance/class types in modules

Avoid using instance/class types in modules #335