code simplification
yota branch has gone