Fixes #171
Clean up