fixed filename and clean up
streched out guid oneliner for clarity
Merge pull request #6 from kalmas/clean

Clean