Few changes after @rjernst review