Merge pull request #522 from tj90241/code-cleanup

Code cleanup