code cleanup
Merge pull request #21 from adobe-webplatform/code-cleanup

Code cleanup