Style and chap 18 fix