Rewrite short task
Little changes