Clean up a bit.
Merge pull request #74 from nZEDb/dev

Clean up a bit.