cleanup; changed some refs to newman to self