last touches of refactoring