Making Jerome's changes

Hopefully slightly clearer to read now. @jeromekelleher?