Review as per @briancavalier comments.