added vfat handling and cleaned up indenting