variable renaming and some minor cleanup
Merge pull request #1 from stdweird/dzila-wipemetadata

variable renaming and some minor cleanup