remove no use code and more space between function