Some tweaks on top of Adrian's tutorial. Mostly just language and style
changes.