little bit of cleanup
connective factory