Update after @simonw review