ticket1: troche refaktoringu