cleaned directory, better semantic