- Some refactorings