closes #6
code clean up