Code clean up

But it's not clean at all.
And I should write Task Queue example AFTER I get some sleep....