Dir list fix and output clean up