some cleanup; welcome [brandi]!