Slight permformance improvements