Cleanup: trailing whitespace, filename, temp file
Merge pull request #25 from henrik/cleanup1

Cleanup: trailing whitespace, filename, temp file