Clean and refactore Module