Code: Minor preformance improvements.