General code cleanup.
Merge pull request #60 from pifantastic/cleanup

General code cleanup.