[refactoring] minor refactoring