refactoring 07_05_2014