Cleaned up files.
Merge pull request #1 from brettp/cleanup

Cleaned up files.