[system] refactoring