joi 5.x.x
Further style cleanup