[FIX] Code cleanup and comment fixes.
[FIX] File name case.
[FIX] File name case.
Merge pull request #117 from intportg/dev

Code cleanup and comment fixes.