Updates module clean up
Merge pull request #2 from justartem/patch-2

Updates module clean up