Directory code cleaned