working on the feedback from @sgrif and @rafaelfranca