Apply review comments from Alisdair & Alex
Update based on Alisdair's second review