Improved code speed and clarity.