refactoring (preparation to new aspects)