cleaning up
closes #149