sys refactoring