TRIVIAL minor refactoring