Cleaned Code
Optimized Code