Refactoring of Session-Variables