Refactoring Base module and comments