Checking some refactoring