some cleaning up of chap 3