Re: optimize the code