revise module pattern and get rid of excess data