Refactoring module name, cleaning