System code refactoring
System code refactoring