Contiued cleaning up. LB
Cleaning up. LB