Refactoring code System Module