Clean code
Fiw bug over tdir