Code performance improved