minor refacto #www