some minor cleaning up.