slight perfomance improvements