Some small simplifications,
added bolding for selected lines.