more chapt3 cleanup