Tidy task register
Fixes from pull request