code cleanup for adaptors/factories
2 files changed