Did small improvement to optimize performance.