Code simplified.