Clean up and clarification on mixup with file and directory