Minor code cleanup.
Merge pull request #142 from patriksvensson/develop

Minor code cleanup.