Refactorings & corrections