remove export statement and introduce local for classes and modules