More Cleanup

Cleaning up the code. Focusing on NTFS code first, then I will implement
the non NTFS code