Code Clean and Speed up