Minor tweaking, moving var order.