Some improvement after Ishan's review.

Ishan's Review: http://annotary.com/bookmarks/225429/abhishek-gupta-knoxxs