Clean up annotations, closes #73