Minor cleanup ... seems to be working.