Tested and polished comment-wise.