Merge pull request #882 from testn/code-cleanup

Code cleanup