Applying sblanc's review feedback