includes suggestions from John May

https://github.com/cdk/cdk/pull/36