MINOR refactor