minor (refactoring)