code clean up #21
code clean up #21
code clean up #21
Merge pull request #23 from ahebert/master

remark, code clean up