Task #2 simplification