change paramter
remove unnecessary comments