Improve semantic function
Semantic improve, typo, bugfix