Small cleanup with CqlFamilyFactory