Fixes to 'Clean code. Pt 1.'