code cleanup for adaptors/factories
36 files changed