Code simplified.
Performance improvement.