other vetka

my refactoring, look please.