refactor listen functions
remove redundant warning
Merge branch 'refactor-modules'