Completed another pass through the code