[Refactoring] Minor