System refactoring.