code clean up , optimized by 8%