rectify path.
improve style.