More clean-up.
Merge pull request #2 from Kizbitz/cleanup

More clean-up.