Code cleanup.
Merge pull request #1 from ktkonrad/master

Code cleanup.