Made the code faster?