Make some refactorings