Clean up, update comments.