one more slight cleanup - I am done for now.