Cleanup
more cleanup
Fix for Issue #34