Code cleanup.
Merge pull request #95 from bendiy/19146

Code cleanup.