Revision to matching Taylor's coding style