Refactoring: Module cleanup