Made some efficiency improvments.