Improved code even further.