unnesesary lines are removed
minor refactoring
tasks 2_* are fixed after review