small performance changes