Refactoring modules
Cosmetic changes