Massive code cleanup.
Merge pull request #14 from Twiebie/master

Massive code cleanup