Fixing whitespace: tabs to spaces
Added conditional diskformat