refactoring 17.04.2014