Minor CPU optimization...