move to inside class