code cleanup
Merge pull request #213 from pfschwartz/develop

code cleanup