Reduced & Improved code.