Removed outer functions in modules