Actioning Matt's review comments