Task cleanup

Closes #47