refactor using $ prefix for internal modules