Code: Minor preformance improvements