commonizing

6 files changed