UPD: code cleaning