code clean up
Merge pull request #26 from vossgang/matt-copy

code clean up