code review fix part #1
code review fix part #2 with inner class for FileVisitor
code review fix part #3