refactoring 10.3.2014