More readable code
New test for building vocabulary ... tbc