Cleanup contributing

Fixes #1656