[Directory]: code cleaning