common: code refactoring