Code efficiency changes...