(ref) some refactorings