Minor code layout change
Avoid directory listing