Some small code cleanup.
Merge pull request #43 from immortius/develop

Some small code cleanup.