refacroring (20.02.14 14:00)