Simplify Task a bit