Make the code faster