Refactoring Control and Data module