Re-arranging stuffs.
Fixed typo.