[TRIVIAL] some minor refactoring