Clean up the code that is used to remove the temp directory.
Merge pull request #2 from achrist/adam/fixup-clean-code

Clean up the code that is used to remove the temp directory.