Tidied up the confusing inconsistences between tasks