applied Jonathan Wakeleys edits