Address code-review

* Change loop to indexed `for` loop
* Moved isDirectory check to IsDir local func, to prevent continue in loop and messy try/catch
* Cleaned up white space issue with patch

Author: shayne