Clean tasks

Some minor things.