13.02.07_1

Small refactoring