chap 1 and 2 cleanup
chap 1 and 2 cleanup