additional edits to James’ code

Revision:
13:f9a20b88455c
Parent:
11:9b414412b09e