Applied same optimization logic to other List methods